Araxis Merge
Araxis Merge is a two and three-way visual file comparison (diff), merging and folder synchronization application for Windows and Mac OS X, created by Araxis Ltd. The article Comparison of file comparison tools compares a number of file comparison applications, including Merge.
Features
- Two and three-way visual file and folder hierarchy comparison
- Full support for ASCII, MBCS and Unicode character encodings (and input method editors)
- Text, image and binary file comparison
- Changes highlighted in color, with linking lines connecting related portions of files
- Point-and-click merging
- In-place editing of files
- Comparison of cut-and-pasted text, as well as files on disk
- Unlimited undo
- Automatic intelligent merging of files and folders in a three-way comparison
- File comparison integrated with folder comparison
- Creation Standalone HTML and XML reports of file and folder comparisons
- Print/print-preview
- Command-line interface
- Automation/AppleScript and plugin APIs
- Direct access to files and folders on Perforce and Subversion repositories